From 55778efba21b3f07d8f32bcce23841965363f5ab Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 22 May 2003 04:08:35 +0000 Subject: [PATCH] Add prefer_shortnames back in. --- gpsbabel/csv_util.c | 8 ++++++++ gpsbabel/xcsv.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index a89bcfe37..9d2f7f530 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -35,6 +35,7 @@ #define TIMET_TO_EXCEL(a) ((a / 86400.0) + 25569.0) extern char *xcsv_urlbase; +extern char *prefer_shortnames; /*********************************************************************/ /* csv_stringclean() - remove any unwanted characters from string. */ @@ -604,6 +605,13 @@ xcsv_waypt_pr(const waypoint *wpt) description = csv_stringclean(wpt->description, xcsv_file.badchars); } + if (prefer_shortnames) { + if (description) { + xfree(description); + } + description = shortname; + } + i = 0; QUEUE_FOR_EACH(xcsv_file.ofield, elem, tmp) { fmp = (field_map_t *) elem; diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c index 004413bd5..f17d713cf 100644 --- a/gpsbabel/xcsv.c +++ b/gpsbabel/xcsv.c @@ -35,6 +35,7 @@ static char *snlenopt; static char *snwhiteopt; static char *snupperopt; static char *snuniqueopt; +char *prefer_shortnames; char *xcsv_urlbase; static @@ -45,6 +46,7 @@ arglist_t xcsv_args[] = { {"snupper", &snupperopt, "(0/1) UPPERCASE synth. shortnames"}, {"snunique", &snuniqueopt, "(0/1) Make synth. shortnames unique"}, {"urlbase", &xcsv_urlbase, "Basename prepended to URL on output"}, + {"prefer_shortnames", &prefer_shortnames, "Use shortname instead of description"}, {0, 0, 0} }; -- 2.30.2